diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index a34c140a9313..45f96b235e6e 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -771,9 +771,9 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const css::util::URL& aURL,
                     pItem = pDispatcher->Execute( GetId(), nCall, nullptr, &aInternalSet, nModifier );
 
                 // no bindings, no invalidate ( usually done in SfxDispatcher::Call_Impl()! )
-                if ( SfxApplication::Get() )
+                if (SfxApplication* pApp = SfxApplication::Get())
                 {
-                    SfxDispatcher* pAppDispat = SfxGetpApp()->GetAppDispatcher_Impl();
+                    SfxDispatcher* pAppDispat = pApp->GetAppDispatcher_Impl();
                     if ( pAppDispat )
                     {
                         const SfxPoolItem* pState=nullptr;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index f21710cf058e..e79c38b4674a 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1461,7 +1461,8 @@ void SfxViewFrame::KillDispatcher_Impl()
 
 SfxViewFrame* SfxViewFrame::Current()
 {
-    return SfxApplication::Get() ? SfxGetpApp()->Get_Impl()->pViewFrame : nullptr;
+    SfxApplication* pApp = SfxApplication::Get();
+    return pApp ? pApp->Get_Impl()->pViewFrame : nullptr;
 }
 
 // returns the first window of spec. type viewing the specified doc.