diff --git a/app/src/main/java/com/example/theloop/OnboardingViewModel.kt b/app/src/main/java/com/example/theloop/OnboardingViewModel.kt
index cc63d54..d687b97 100644
--- a/app/src/main/java/com/example/theloop/OnboardingViewModel.kt
+++ b/app/src/main/java/com/example/theloop/OnboardingViewModel.kt
@@ -23,8 +23,10 @@ class OnboardingViewModel @Inject constructor(
     }
 
     fun saveName() {
-        viewModelScope.launch {
-            userPreferencesRepository.saveUserName(name.value)
+        if (name.value.isNotBlank()) {
+            viewModelScope.launch {
+                userPreferencesRepository.saveUserName(name.value)
+            }
         }
     }
 
diff --git a/app/src/main/java/com/example/theloop/ui/screens/OnboardingScreen.kt b/app/src/main/java/com/example/theloop/ui/screens/OnboardingScreen.kt
index 7103a82..04e93df 100644
--- a/app/src/main/java/com/example/theloop/ui/screens/OnboardingScreen.kt
+++ b/app/src/main/java/com/example/theloop/ui/screens/OnboardingScreen.kt
@@ -98,9 +98,7 @@ fun OnboardingScreen(
                     Button(onClick = {
                         if (currentStep == 0) {
                             // Save Name
-                            if (name.isNotEmpty()) {
-                                viewModel.saveName()
-                            }
+                            viewModel.saveName()
                         }
 
                         if (currentStep < totalSteps - 1) {