diff --git a/src/character.cpp b/src/character.cpp
index df024ed54e575..4e0cf5c8d07db 100644
--- a/src/character.cpp
+++ b/src/character.cpp
@@ -11012,12 +11012,20 @@ void Character::process_effects()
                     ( size == creature_size::medium && free_cargo < 62500_ml ) ||
                     ( size == creature_size::large && free_cargo < 125000_ml ) ||
                     ( size == creature_size::huge && free_cargo < 250000_ml ) ) {
+                    if( !has_effect( effect_cramped_space ) ) {
+                        add_effect( effect_cramped_space, 2_turns, true );
+                    }
                     is_cramped_space = true;
+                    return;
                 }
             }
             if( get_size() == creature_size::huge && !vp.part_with_feature( "AISLE", false ) &&
                 !vp.part_with_feature( "HUGE_OK", false ) ) {
+                if( !has_effect( effect_cramped_space ) ) {
+                    add_effect( effect_cramped_space, 2_turns, true );
+                }
                 is_cramped_space = true;
+                return;
             }
         }
         if( !is_cramped_space ) {