diff --git a/DNN Platform/Library/Entities/Modules/Settings/SettingsRepository.cs b/DNN Platform/Library/Entities/Modules/Settings/SettingsRepository.cs
index 48a8d0daae9..28ace91909c 100644
--- a/DNN Platform/Library/Entities/Modules/Settings/SettingsRepository.cs	
+++ b/DNN Platform/Library/Entities/Modules/Settings/SettingsRepository.cs	
@@ -50,7 +50,7 @@ protected virtual string MappingCacheKey
         /// <inheritdoc/>
         public T GetSettings(ModuleInfo moduleContext)
         {
-            return CBO.GetCachedObject<T>(new CacheItemArgs(this.CacheKey(moduleContext.TabModuleID), 20, CacheItemPriority.AboveNormal, moduleContext), this.Load, false);
+            return CBO.GetCachedObject<T>(new CacheItemArgs(this.CacheKey(moduleContext.PortalID), 20, CacheItemPriority.AboveNormal, moduleContext), this.Load, false);
         }
 
         /// <inheritdoc/>
@@ -164,7 +164,7 @@ private void SaveSettings(int portalId, ModuleInfo moduleContext, T settings)
                     }
                 }
             });
-            DataCache.SetCache(this.CacheKey(moduleContext == null ? portalId : moduleContext.TabModuleID), settings);
+            DataCache.SetCache(this.CacheKey(portalId), settings);
         }
 
         private T Load(CacheItemArgs args)